Reverting change to test upstream fix in model