Revert "Merge pull request #1704 from erikvold/1092882"

This reverts commit bced24ac402caf08633666f2f651ebc35c8002d0, reversing
changes made to 0d0cd533be3962d00dd7fe248e8574baa056cc9f.

Conflicts:
	lib/sdk/test/assert.js