revert commits on master; moving to branch