The core reset fix was accepted upstream, so move it to its right place. Signed-off-by: Jonas Gorski <[email protected]>