Revert d2b8696..e745433

This rolls back to commit d2b86961013758bc20fa4ede145cbcca59b628b7.