Merge broke everything; re-pulling from upstream.