revert violating violation fixes