Revert c325c64..823e665

This rolls back to commit c325c64a3a1fbd6e008567a699fa634def7773eb.