The official snapshot seemed to be working fine before this pull-request?