The header states "shouldn't be exposed to users anymore", and so we
should probably look at how we might achieve the same thing with the API
that is intended to be exposed to users. This compiles and works with
Boost 1.49.

Change-Id: I2086f227c45692bd6aa224742369d70f71b5b264