Reverted some changes made by last merge. All is well