See main CR. When fix was reviewed I was asked to move some constants into the platform-specific files, but forgot to add those to the original review set, so they were left behind.