Reverted change added logging