Synced with the source at 90b4f6c .