Revert 93341a0..1298a19

This rolls back to commit 93341a03079775304cae07b39aecc1606d904e91.