Revert to commit a029221daa2d592e72a2d07df02afc6888678a0b
Merged issue fixed