Revert "Suspend Actions (3/3)"

This reverts commit dfe9636d3ab672656bab45e966d1ae4086fb0461.

Change-Id: I82453c8283499a1a29237986b86293f1d1ee4fb5