Revert "Bug 511517: 11 test errors in SearchCheatsheet since I20170201-1030"

This reverts commit d19215a5ae3190b86b13d9ce52f1ca6166df5ece.
2 files changed