Removed some dirty, site-specific hacks.

Change-Id: I0c94f374e6ab46dd25c6437f076513ddd43a2354