* revert of patches r3978 and r3979