Reapplying #9754

Signed-off-by: Don Kjer <don.kjer@gmail.com>