revert #1470; fix #1493