Revert r95930, r95931 and r95939. Poorly commited patch