Revert 5b6a8d5..31e4aa4

This rolls back to commit 5b6a8d57ce69de101a664be325f0a19ec259d422.
Changed my mind...