Revert d249ef2..e92fd3f

This rolls back to commit d249ef20971e0961d6f96efd3f01e64bdf73efe4.