diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
index 30cde09eb5..4209e6ac20 100644
--- a/libraries/chain/block_header_state.cpp
+++ b/libraries/chain/block_header_state.cpp
@@ -71,8 +71,7 @@ block_header_state block_header_state::next(block_header_state_input& input) con
 
    // header
    // ------
-   result.header = signed_block_header {
-      block_header {
+   result.header = {
       .timestamp         = input.timestamp, // [greg todo] do we have to do the slot++ stuff from the legacy version?
       .producer          = input.producer,
       .confirmed         = 0,
@@ -80,7 +79,7 @@ block_header_state block_header_state::next(block_header_state_input& input) con
       .transaction_mroot = input.transaction_mroot,
       .action_mroot      = input.action_mroot,
       .schedule_version  = header.schedule_version
-   }};
+   };
 
    // activated protocol features
    // ---------------------------
diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index c2f0968c5c..35c77e78d1 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -18,7 +18,7 @@ block_state::block_state(const block_header_state& prev, signed_block_ptr b, con
 {
    // ASSUMPTION FROM controller_impl::apply_block = all untrusted blocks will have their signatures pre-validated here
    if( !skip_validate_signee ) {
-      auto sigs = detail::extract_additional_signatures(b);
+      auto sigs = detail::extract_additional_signatures(block);
       verify_signee(sigs);
    }
 }
@@ -218,7 +218,7 @@ void block_state::sign( const signer_callback_type& signer ) {
    auto sigs = signer( block_id );
 
    EOS_ASSERT(!sigs.empty(), no_block_signatures, "Signer returned no signatures");
-   header.producer_signature = sigs.back();
+   block->producer_signature = sigs.back();
    sigs.pop_back();
 
    verify_signee(sigs);
@@ -237,7 +237,7 @@ void block_state::verify_signee(const std::vector<signature_type>& additional_si
    );
 
    std::set<public_key_type> keys;
-   keys.emplace(fc::crypto::public_key( header.producer_signature, block_id, true ));
+   keys.emplace(fc::crypto::public_key( block->producer_signature, block_id, true ));
 
    for (const auto& s: additional_signatures) {
       auto res = keys.emplace(s, block_id, true);
diff --git a/libraries/chain/include/eosio/chain/block_header_state.hpp b/libraries/chain/include/eosio/chain/block_header_state.hpp
index d71265ae3b..62cba6ee03 100644
--- a/libraries/chain/include/eosio/chain/block_header_state.hpp
+++ b/libraries/chain/include/eosio/chain/block_header_state.hpp
@@ -42,7 +42,7 @@ struct block_header_state_core {
 struct block_header_state {
    // ------ data members ------------------------------------------------------------
    block_id_type                       block_id;
-   signed_block_header                 header;
+   block_header                        header;
    protocol_feature_activation_set_ptr activated_protocol_features;
 
    block_header_state_core             core;