Revert "improved handling of broken actions"

This reverts commit b70a7e56ba95315fa1f6f5b99cebb21dcec1bb93.