Revert to 3dffb45416
Merge origin/master