Undone last changes of original sources. Stick with the old version for now.

Change-Id: I69486e1c8bbe751c6a5db84aa4a59a4c040e6d7a