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