Revert previous commit, there was no bug