Update ramblings/revert-B-load-BEGIN patches RT#81332 for 5.14/5.16