Forgot to commit other changed files for 8bf788f36