revert due to incompatibility with synchronizerCR