Update from not-CloudPebble.