Fix bad merge commit
Merge pull request #1680 from joshmoore/fix-10618-thumb-test

Fix bad merge commit