Reverted previous bogus 'fix'