Revert 5933251..2a966c5

This rolls back to commit 5933251d75dc07be6b7f81f138a9263d00acb7f4.