See my top level comment regarding legislation in progress to fix the issue.