Revert 5e0b3dd..03381cd

This rolls back to commit 5e0b3ddafad4d898a26f12e81a7cf5aeaea5a603.