*8787* Revert modernization