Revert LPS-40221 - the logic assumes the images are only used for user portraits and throws exceptions for any other image