Restore checks for WITH_PROTOCOL_BAHAMUT.