REL-1474: switch back to val