actually let's keep things clean in master. reverts previous 3 commits.