remove dependency on firmware revision