refactor redline save/restore

Change-Id: I4840d694954a5c0419abfa4c0fbe67b756f8253c
remove old redline save/restore

Change-Id: I3165f84d44c74bca3a2d75ebf3cd681b9d5d120a
still ugly, but lets silent the warning for now

Change-Id: I647e969bfc9f8b4294d3e526d8d5b11df7d7bea9