revert #7417

cc @peterflynn