Small optimization to avoid extra monolith calls (bug 931137)