Merge "Remove workaround for bug that was fixed a while ago." into jb-dev