Revert 3b7e966b + 4179c38c (does not work right)

Change-Id: I706efb5a9d76359a3851ad9b498a71c851cd92ad