Revert r29647, as per my comment on bug 12536.