revert ace7a61e663e8369cc50e527c990ee4c3751cb89

This change causes head/tail inconsistency as demonstrated in SI-7445.