Bumping this, as this is still an issue as the recent patch has made very clear with all the script conflicts going on.