reverted some changes that were accidentally made during last merge