Please back out the changes for faq and registration.  That's not our code, we're not using it, so the change would only serve to confuse others (i.e. we change code in the package, but without using it)