reverting that hacky crap