Reverting my changes in these two files since ALF takes care of them