Could we add some comments here for why this actually had to be done.