A lot of the changes in apiserver could have been represented more cleanly - this returns the signatures to their older behavior (and unbreaks OpenShift).