Revert eea7ef3..eda577b

This rolls back to commit eea7ef3453ba2aef2c569e540acd893203cab181.