rollback some changes for merging back into master