Revert b4cac30..7216bd4

This rolls back to commit b4cac308cad0d94678579ab902f5527bd9173d2f.
Merge branch 'master' into rob-branch
Merge branch 'rob-branch'