Revert to version 1.12.1 & trunk