Revert 4733cc3..816af7a

This rolls back to commit 4733cc31fb67d95c013ecab3e4195f4606f28a7a.