4ef09d2b79
Various people voiced their concerns about these changes. Until this is resolved, we should use the old version.