Revert r221096 bringing back r221014 with a fix.