It seems we may have some autobuild problems after this commit went in. Trying to see if a revert helps to get them back. This reverts commit 2716350d.
