This reverts commit 87306184.  The
behavior in certain cases is still being debated, and it's too late to
solve this before beta.