Merge "Remove unused pipelining optimization." into jb-dev