Revert of pull request #1082

My bad