Rolled back changes to utils package