This should hopefully clean up the merge mess I made.

Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 0a55133048c1b706832770b3ce5a78ed15fb8c50, reversing
changes made to 9d7221e6551f88353185c718f9a11eff10e39344.