Reverted v3a because master should only have stable rules