This reverts commit 3b843fd942cdb2e5623887073d1acb0d759066c8. I was tired, we should either remove the that and then the is or keep a is or... But this latest commit was changing the meaning.