OS X workaround no longer needed for new images