Removed all recently added custom changes to clean this up; use gem version instead