This will still break on "master" and future releases like "3.2". I think its overcomplicating, let's leave out those rules.