Revert a7fde86..05fc534

This rolls back to commit a7fde86482915656fff8181a1533d3f47e0037b3.