Created by: tsenart
This reverts commit 602d32e97cabf62a015bfce315fe2e21c6936a0a.
Reverts a commit that broke functionality, no test appropriate.