* This is no more needed and left commented out in case we need to deal with a similar issue in the future.