Revert accidental commit of some changes in 13c6b03