Revert c9fb2a4..09b6c4b

This rolls back to commit c9fb2a41aaa90de5bd83b9dda0d58a64affd94c5.
Revert 09b6c4b..5c416e0

This rolls back to commit 09b6c4be2aedde6d16a74c15d41b0b0ac207aea3.
The shoot action is not constant.