[RFC] Revert patch for bz#737223