Revert "About to revert this"

This reverts commit b1d83db05b63f6bd482c6de06a843012090d9b79.