This reverts commit ba92681d2fed403a00b49e13697b13aa37e0e855, reversing
changes made to 71dd9111bad26d5d4235ecdd1b42c60591cd2f35.