I have it commented out right now because I need to assess if its needed...let's leave for now (I added a TODO to this effect).