Fixed the weird merge issue that blew away my changes.