Restoring commit 463c55: RESTEASY-699.