Revert "Merge remote-tracking branch 'dhacker/L' into 5.0-caf"

This reverts commit a993d6fffd560439bc0eb26f8f3abd4ac59416de, reversing
changes made to 30579b41d1e943a7740b3dfe979d40f40ba0d8cc.