Fixes Bug 573834 - Moving PFS from Zamboni to PFS2.