Revert eb6f9d3..9d02525

This rolls back to commit eb6f9d31325acf02fb35c8d6e476084101f8d94d.