In the PR merged here, there was a large white space diff that proved problematic merging up from 5.5.x up to master, and that specific commit has been reverted. This ticket is to just make that change, preferably not during crunch time.