Revert d11b6fc..de5d8cd

This rolls back to commit d11b6fc14b329d0401ad8a966b3fd488b3e32f9d.