Revert some un-intended change in previous commit