Revert ce5bb02..b1f64a4

This rolls back to commit ce5bb0213e92e03bf66dbd21fd492127ca3cc8d3.