Remove one more Mock access hack