Reverted bogus part of 01837482