r6432: Restorin previous construction of conditions after a little discussion