Merge "Remove over aggressive optimization." into jb-dev