Here's the final version that I pushed.

Tested aarch64-linux, x86_64-linux.