r18014: revert a possibly unnecessary change