Revert ff2c320..dd3cea2

This rolls back to commit ff2c32045fd59f560c9218c9449900b434217b31.
DEATH