Reverted previous checkin as it was not the problem