Bug 13796: (follow-up) Move renewal remaining statement back