Revert c9f0166..684c922

This rolls back to commit c9f016691cfeac9b654b00ca2c7e1ce0ea707f94.