revert of the boolean related changes that didn't actually make sense