Revert changes done to BLP lib, cc @Thoorium