Undo last commit, as it does not solve the problem entirely.