Complete as of [29a180ad4e]