This reverts commit f383fb40. It looks like several of our build bots are still using the legacy target names, so we'll change those before we commit this change again.
