Bug 1033897 - Remove custom logic and set user story field