Revert 3127fee..3cdb294

This rolls back to commit 3127feebc601606588da270b4884326fffb6b761.