Revert ec704b2..69032e5

This rolls back to commit ec704b29af456365edc790fd795e3c9d5673902b.