Restore some changes lost in the merge