Sanity restored to my fork