Fixed the last merge so that everything we broke should work again now.