Revert "Merge branch 'master' into AcceptanceStrategy"

This reverts commit 7a2eb535c5257f9f3b59214747223d3f6869db43, reversing
changes made to 3268f544251b82912e0715d157b9b0d1dc795b71.