Revert cb35379..f0f5f13

This rolls back to commit cb353799f49e8e86fa80f33c8660342bdcf8fc29.
DEATH by fire