Bring back the shibeface!
Port custom shibeface from b14d83aabd45bafba5e9329fec95b58d0073de19