Revert conflicted changes with Jeff Lawson's boost-oriented improvements.
BUGZID: