Please roll back all changes not related with the fix