Revert "Just commit this merge crap, as going to revery everything Nallath did anyhow."

This reverts commit 9a70d5add5e06e5c0afd302dbada6ca293fef218, reversing
changes made to 15a51780f0b9c95e0c908b8e3c5f3c69be5c980d.