Bug 847830 backout v1.0.1

Backing out as per request by RyanVM