Revert "Self_Action fixes"

This reverts commit 4d973103a18e15ad1caf71e5ef956303a2694479.