Revert "Merge branch 'Automation'"

This reverts commit 409bc8d795c3ce09aa20b00b6bb9914f55850f9c, reversing
changes made to c6cd29b74ce04dab3a99059ce3111f35b3fcf082.