Revert: "Eliminate needless use of reflection"