restore 6.1.3 valve behaviour