revert #1470; fix #1493
Merge branch 'master' into iij