BRMS: Remove workaround