Revert f5b3508f200892b0e1548071b390cc81104ece2a
Revert f5b3508f200892b0e1548071b390cc81104ece2a

This patch removes changes made in the above mentioned commit as it broke
shared component.

siteshwar/ozone-wayland,joone/ozone-wayland,nagineni/ozone-wayland,likewise/ozone-wayland,01org/ozone-wayland,kuscsik/ozone-wayland,siteshwar/ozone-wayland,nagineni/ozone-wayland,mrunalk/ozone-wayland,nagineni/ozone-wayland,joone/ozone-wayland,mrunalk/ozone-wayland,kishansheshagiri/ozone-wayland,joone/ozone-wayland,likewise/ozone-wayland,mrunalk/ozone-wayland,kishansheshagiri/ozone-wayland,clopez/ozone-wayland,kuscsik/ozone-wayland,siteshwar/ozone-wayland,likewise/ozone-wayland,nagineni/ozone-wayland,kuscsik/ozone-wayland,01org/ozone-wayland,kishansheshagiri/ozone-wayland,01org/ozone-wayland,01org/ozone-wayland,kuscsik/ozone-wayland,clopez/ozone-wayland,clopez/ozone-wayland,likewise/ozone-wayland,mrunalk/ozone-wayland,joone/ozone-wayland,clopez/ozone-wayland,siteshwar/ozone-wayland,kishansheshagiri/ozone-wayland