Regression fix [1] just landed. The "@2G" workaround is no longer required.
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f3057ad767542be7bbac44e548cb44017178a163