Revert #1232
Merge branch 'origin/master'