Will try to cherry-pick related commit on greg's tree first tomorrow. and talk this issue with Greg. If the reason is like your guess. :) we can do the second solution.
OK. Please keep me in the CCs if you mail Greg, and it probably makes sense to loop in the original author too.