Revert "Revert "Actuator workaround (thanks faust93 and xboxfanj)""

This reverts commit 613312f67e81534179df5f3af07c7163224a0702.