Revert the previous bugfix