Merge "Fix my fix." into jb-mr1-dev