Revert "Merge pull request #1756 from jpartlow/issue/master/6112-fixing-acceptance-test"

This reverts commit 77aa6f61ba2d4d5d85eb4ae967322a9d41d11e5f, reversing
changes made to c0d1eafa19da0a783fec8670500ef08fb7c23d5c.

Joshua Partlow @finch, we just passed each other on #1756; andy and kylo had some
changes they wanted. Sorry for not getting that in the pr. There must be
a better way to coordinate on these things

Adrien Thebo @jpartlow I was too eager to merge that
Adrien Thebo should I revert it for now?

Joshua Partlow yeah if you would