Revert "Commit to get it working again"

This reverts commit ec50cd491b0d292ab689da9ba4fc3d02bd8516ff.