Revert "Merge remote-tracking branch 'slim/lp5.0' into lp"

This reverts commit cf7794f19eccb826ae16116d9fb5da5df183c22e, reversing
changes made to f044c2b383f89e7f8e16945c481d082bde56e963.