This reverts commit 4f4f3384.

This commit has some ugly corner cases and needs to be discussed
further.