Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev