Backed out 2 changesets (bug 817586, bug 826639) for crashes and robocop failures.

Backed out changeset 57a3afad9252 (bug 817586)
Backed out changeset 6a57e0f94616 (bug 826639)