This broke two tests. Presumably the non-short-circuting '|' was intentional here. This reverts commit f7efea0d.