revert FastPass
Merge pull request #388 from settinghead/fix/revert-fastpass

revert FastPass