Go back to voted-on PSR with eye towards PSR-0