Clearly a temporary solution until a defined behavior can be established. This commit was SVN r23075.