The workaround should now be portable.