Reverted previous commit, moving to pull request