While this is slower, it ensures we have a proper image parent and can track images for retirement correctly.