Revert f9ddbb5..3b4651a

This rolls back to commit f9ddbb57e065ec00088556bdc3deeca3e24285ab.