Revert "I hate git sometimes"

This reverts commit f9b2b382b51883938b883e4a5978bd0f46782653.
Revert "Merge from master"

This reverts commit 42af9f98fc861dc64985a5361c501e04406ef347.