Merged test-trigger from repository dildick
Revert "Merge pull request #2913 from mark-grimes/rebase2785"

This reverts commit aeb68f02aa3d7a6783d07d722d274287854b09b2, reversing
changes made to cb5a53d08244e2705b8b5cc4d677a4489baec5a0.