ARIES-468 Didn't mean to commit this change since it is unrelated to ARIES-468. I didn't select it to commit, so not sure why subclipse committed it.