Revert f8b60a8..7b8fbf1

This rolls back to commit f8b60a874ae7df9bd128177678cc5d8e42ef96f8.