Thanks to Howard Miller for the report. (cherry picked from commit feb89b5fd038de1f8f29881814fd5b4c7971b62a)