Partially revert r9636. It is true that we can directly return the