This reverts commit c22569eeea. Let's revert this for now, since it apparently doesn't fix the problem at hand.
c22569eeea