r238510 broke scopes of size zero