revert some symlinks

Change-Id: Ia435f743f98846a606f4d8be29e7a41221c2d7cf