Please see http://conjoon.org/issues/browse/CN-618 for the issue this patch was
introduced for.