Commit bfa9b62858 accidentally reverted these (because my editor did not reload the file correctly). Fixes #4904.
bfa9b62858