Bad merge (worse: rebase), no tests. Sad code-monkey.