Revert cb35379..0dd3cc4

This rolls back to commit cb353799f49e8e86fa80f33c8660342bdcf8fc29.
wall off the blazes