Question: Is there any way yet to stop Photos automatically creating albums?

Most of my pictures go straight into the camera roll, everything cross linked and backed up to iCloud. So far so good.

However sometimes when I download a picture from say WhatsApp, Photos takes it upon itself to create me a folder/album of that name. Erm why?? I have to then delete the auto created folders otherwise I end up with loads of pointless folders because the photos are actually still in my camera roll.

I appreciate I could simply view all my photos in the camera roll but I like the simplicity of the Albums view tab.