Fsk followup on 6009 rebased

Fix #6009.  Rebased version of #8970.  Inherits review from alexcrichton.