Remove workaround
Create stable branch (correctly this time...)
Merge bug25590
stable to default