re-merge log entry from 13b303a