Revert a8af1e1..8750129

This rolls back to commit a8af1e1dff9f8d7d2619d2d5ccb8f8dac11b76fe.