Revert a74d4e0..c834fe4

This rolls back to commit a74d4e04583f16a098eac2800a2c8344da346901.