I don't know why all of this code was removed in this PR :(