Re-enabling hopefully a less horrible resolrize job