Back out the change at [47cd634c98b502d4] which was incorrect. Add a test

case so that we don't accidently back out that change again.

FossilOrigin-Name: 596ac2a4eab28b74f4050fb4eb71883f2a1421fdbccf302413e4653391bb52c9