Revert 83ab56b..4a09162

This rolls back to commit 83ab56be9187c6b0dbd4427cbd1eda0cea7bccf8.