Reverting to the version in Secretrobotron's repo. Something went wrong during last merge :/.