I just added the above line right before this commit. Can we consolidate the two?