Revert afad25e..8bf5b61

This rolls back to commit afad25e6afb21c3380c93e6686f1cfb2c809991f.