Reverted first try to save the build