This change is needed for 2.8, where the NULL check isn't a reliable way of testing if dynamic offset is needed.