Reversed the latest commit, Micha has other plans for it.