Revert 3fcacc0..4c12303

This rolls back to commit 3fcacc06a86062512c79fc2c3a6866e13a643db6.