Revert 85cc86c..2a7f8dc

This rolls back to commit 85cc86c39beeabc7d2126517197eff65f86525d1.