DELTASPIKE-743 restore functionality that fails on some JVMs