Revert previous commit (introduced redundant code)