Revert simplification because of P2K P3K consistency issues