Revert dc3e239..1a0c08f

This rolls back to commit dc3e239118dfccb3e04bce4fac0f0c9a8dfed96a.