I discussed that some months ago with @dbu and I was told we should because it's the only solution for 2.1.