This reverts commit 18c914fc. This was supposed to be on a branch so I could make a merge request out of it; sorry about that.