revert experimental feature on master