Revert to d95adbc584