Revert previous escape hack, as they addressed this with 12.1 update.