Revert Bug 910316

This reverts commit cf5ec4a409ea46d37c4a682537006835014e2e7c.

Gaia tree has been closed, disabling us from continuing to push the necessary commits for v1.2.