Revert "Bug 912839 - Sync SDK changes from bug 910517 to the github repository r=me" because the main bug got backed out for test failures.

This reverts commit 43a513a88d3b7696fd8bbc30a2325d57e4531424.