Revert f58018f..e55de3e

This rolls back to commit f58018f4311fc8208744667bfe24901124beb7a0.