Reverting b09ed35854. Theres a better fix