Reverting r91642 per CR and pending review need-patch/patch in bug 29755