Try to handle aborted rotation a bit better.