Revert "Update to the new version of this file from the master.  It displayed a conflict when I attempted the pull request."

This reverts commit b13f14e0da6167976c21d8066e03dde0f4816ceb.