Revert a9598f8..83979bf

This rolls back to commit a9598f83f4b3355523bb2435d9f671cafcd95f48.