This reverts commit 24a54f79.

Stephen Hemminger <shemminger@vyatta.com> writes:
> That patch should not be included. It causes more problems than it
> solves, since then there are duplicate file locations which causes
> false duplicate symbol reports.
Reported-by: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NMichal Marek <mmarek@suse.cz>