Merge pull request #1104 from comex/its-like-the-bad-old-days-where-i-broke-master-over-and-over Fix BLR optimization (sorry)
