Clean up hack which is no longer needed after r198617. No functionality change.