Revert the previous commit. This is an issue that needs resolving somehow but just...