Revert 1959157..0e9a38c

This rolls back to commit 1959157524afe4b9ef603d31a50742bb0d4fae2e.