Revert constexpr