Remove dependency on Rules.
Merge commit 'b604' (remove dependency on Rules) into 7.x-1.x