DROOLS-46: Undoing changes that caused test errors