Revert "Needs a touch for felix.scr qualifier update"

This reverts commit 388ed398b809ff1c6bc10140b1e5b14b658ae89a.

Revert "Build failure in I20180903-0800"

This reverts commit 8375a8c168abebb86c264f3908a956cf8f24ca38.

Revert "Build failure in I20180903-0800"

This reverts commit 03226b8a574f1f1dff8878e494c9e33b2cf5920f.
5 files changed