Revert 6f1f241..7465300

This rolls back to commit 6f1f24125b3797256692d40fecad593577c91178.