Revert d827a4e..f960889

This rolls back to commit d827a4eb502441b0f0f6659ded88ddfc1e85c4a5.