Revert "BAD MERGE - but I don't care >.>"

This reverts commit 36cc950be0e42c61b813cfdf584fe9da68daee2c, reversing
changes made to 0ade9851a03096d33d9c6d67151c3593c893efab.