Revert c1d17ba..166ff0a

This rolls back to commit c1d17bab6810c6593dc9b9313b4cea461d2ce91c.