A more proper take on this :dolphin: -> :flipper: thing

/cc @sr @josh