reverted other changes that probably deserve their own pull request