Revert eb70b00..5b2e23b

This rolls back to commit eb70b001f646d26f8bf6497b62b9212349c7760f.