Revert "Bug 1146611 - Cannot discover EAP6.0.1: supportsMatching method fails with IllegalArgumentException"

This reverts commit b95683ae6366745f53923c8d8d4c2d88cf21e17c.

Master broken...