Revert some changes as requested by review