*8787* Revert modernization
*8787* Submodule update ##asmecher/8787-port##