Revert acb65bd..c21e6b6

This rolls back to commit acb65bd0dc0d861791d517ba75948a70502b80c8.
Rolled back before Pagoda