shamu: Partially revert 7051c8055ce13cdebf3c1d1043cf4c3011677fff