Actually I'm having a mild preference to solve the contingency using an externalizer, as it won't need an urgent release of Search.
What bothers me about using a temporary solution is that people won't be able to perform a rolling upgrade.