This reverts commit 93b11edc82, reversing changes made to cb4107191d. This was requested by @johnmccutchan because this change broke the analyzer, which only uses SDK version 1.14.1, since that's what we pull in. He said he'd try again on Monday.
93b11edc82
cb4107191d