Revert bc03f64..1884372

This rolls back to commit bc03f64b11b7ebaf3abc24a2868ebd493cb53728.