Test is now passing
Merge pull request #547 from cpcloud/fix-gz-xpass

Test is now passing
Revert "Test is now passing"

This reverts commit a1e22a402abdb484f62ebf14ade271518e3bdcf9.