Revert "Bug-fix"

This reverts commit 3ef4c2846f96bea78e3ecce0a672a1358103e9dc.