ship punani: revert oversimplification slightly