Cleaned up 684027

Not tested.