reverted intrusive code removal