Need to go back at some point and fix this for real. (cherry picked from commit dfe07df87b)
dfe07df87b