Bug #2106: Use the Image source instead of rebuilding it. Improved action if pool_name is not 'one'