Revert "Merge pull request #842 from jsantell/Q-all-790195" a=@gozala

This reverts commit ef7e1c3a7d2f758496b473b77f251afc1d7e599c, reversing
changes made to 424f66c3663d8d507407952ac8586ab4bc809396.