Reapplying commit 038890: RESTEASY-869