Revert fd680d3..1f97b35

This rolls back to commit fd680d35b0f6d348b4593187782366471506829e.