This is another dangerous change
Revert "This is another dangerous change"

This reverts commit df4f5c4e7d3117fccfc55b93e65ba408ceae7278.