Rolling back some parameter-passing changes for Jay.