Revert captain mode changes because it's still broken and blocking develop.