Revert SF patch 659809 -- it causes double options that can cause breakage.
2 files changed