Reverted 87e2f3631b; which should have never been on master branch