Revert "2.5 New rules fixed"

This reverts commit 01a16003ef6ba9ab6564eb2275b14b106afb7e72.