Reverted incorrect part of 01839e4b.