Navy Controller
Revert "Navy Controller"

This reverts commit 7539f25509028810751d6a89183358b9c5a45147.