Restore Will's commit, and get rid of Shanen's bad merge that doesn't compile