CORE-4036: Another attempt at a horrible workaround.