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

* commit 'fd4df46917c79067416985ac53a3da6b27e8c333':
  Remove workaround for bug that was fixed a while ago.