Unbreaking 2i's heart after refactor