See commit messages.
Edit: Just removed WIP. I've tested it and it's ready now.
This will create a new commit in order to revert the existing changes.
