Please roll back every change not related with the fix