This reverts commit 07a5d8c91 and instead disables the relevant FreeMarker tests for JDK21+ runs.
07a5d8c91