Revert 7c340d4..0c6a9b6

This rolls back to commit 7c340d43d22f96ad2123decf0ce90c590621e949.