Comply with master branch dda013d