Revert accidental, merge-fail-induced, change

introduced in commit b4cbf8bf8adb6929b150c472ce3a008decf732ae