Revert "Merge remote-tracking branch 'ls/jb2' into db42-a"

This reverts commit bc71a224f252496114bd9015a832477811d02fd2, reversing
changes made to fb951a8ee2070800fa3e20ed79c9f302ee32e603.