qualifiers

Revert back qualifiers so that eclipse:eclipse works fine again