revert boost simplification