Brown paper bag commit. Fixed the fix.
(cherry picked from commit 32de2381b75e7f4217e417b207fa6b45ecdb7ce4)