Revert r178079, it caused PR15637.

Also add a test for PR15637.