Should've been included in 4db7c4b