APOLLO-3946 Under the hood reference usage was causing variable headaches