Revert r44367; ends up with an extra fetch :/