ARIES-649 ARIES-647 Oops I managed to backout ARIES-647 when I committed ARIES-649. Needed to take more care of what SVN was trying to tell me.