Rebase fixup for commit 589175f6f38fb61bbdd8c5785f57bcc902b2f2ea

Authored by habacker on Nov 7 2019, 9:11 AM.