Revert "Merge remote-tracking branch 'origin/matthews_behaviour'"

This reverts commit 53fb5405662b50dd4b394554f846430e90da8084, reversing
changes made to 5f02804bbc8fdd793334b2e51b9ab8cdb1d0fe5f.