Revert e1e8bac..aefcc9f

This rolls back to commit e1e8bacff16c78ca0c11623eb75b1c6cbca1ae20.
Working

GRAHH