revert code change on things that made it to master but are not to be touched