Revert ced2cdd..e944bfa

This rolls back to commit ced2cdd89cda997d345ac0940f2604fc27d78a55.