Need to revert ad9e98b8 which this commit depends on. This reverts commit f771ef7b5f0ed260d00931cd50e6fe462edbacaf.