Revert for carbine fix