Reset to pre 4.1.2 master