Revert 5341293..b934473

This rolls back to commit 5341293f984e7a57035a18e579d37e85f630f20b.