reverted some changes that were made downstream but aren't that important