support davin sufer

This rolls back to commit fe8b4b676022f5b9358908f466e07a9d6f80e4bf.