Revert d9f9d5e..eb503ff

This rolls back to commit d9f9d5ec11d4a97aef20b4afae6de1a330c48914.