Revert f7b7626..25f93d1

This rolls back to commit f7b76265744f10d3727e511f90e2a7c6a01fc608.