reverted nucgun changes