I used hack for this that doesn't work for mvapi, so changing it to something more sane. This commit was SVN r9477.