Why the hell am I in the master branch? Now really removes the broken stuff from the last commits.