Restore some changes back to original state, not sure why those changes