Restoring commit a66ac: RESTEASY-863