Revert f278301..6c823c4

This rolls back to commit f278301180fcf97ff3fec0c76c8111fdb5c71c77.
DEATH by pigman