work around JDK-8012351/LP 937200