Revert 948d11a..52623ac

This rolls back to commit 948d11aa583ce1eca5db7119db7b20a7205e3842.