Revert c965db1..62b3aea

This rolls back to commit c965db1ee7fcc72db1cb1c812d250618278db6a5.