This is a completely dangerous change, we're going to want to revert it
Revert "This is a completely dangerous change, we're going to want to revert it"

This reverts commit b5ad694a8e2c8efc3627b711e56b40714c07a024.