Uncommented the above since it does not seem to be a problem now.