Hamsi fix

Original implementation of x15 made changes to hamsi, which in turn
caused issues with other kernels.