Reverted in r44982, breaks backwards compatibility.
(Consider separating the top-level compat functions from the class definition if load time without an opcode cache is a concern.)