v1.3.0.546 - reverse all the things and do what I promised the last 2 commits