Merge branch 'revert-08f41d80' into 'master'