Revert previous commit, it didn't work reliably