Revert a5b0221..7e20481

This rolls back to commit a5b02212a86e576ee573dfe25afde9aeb781686c.