Revert e2e5a65..58a3a4e

This rolls back to commit e2e5a65d5dbf089f8e4aca1a7dba0ff19073ad63.