The solution implemented in #1072 causes lots of confusion. Let's revert it and implement something else.