Revert last commit as it didn't work