Revert d488cb8..873ce2c

This rolls back to commit d488cb8b90394ab514ab5ad09891da51c3286648.