This is a temporary measure that fixes #2692. This reverts commit 15ef8858. (cherry picked from commit 22c47df2)