reverted some stuff that was broken in merge