bug 848238 - revert include-matching refactoring

and one bad test