Revert c470e87..89e6a07

This rolls back to commit c470e879a1da64e2f5ea2099deccafbfc146bd01.