RESTEASY-1066: Backing out previous commit.