This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.