Re-removed _soy files added back in panic due to bug with different cause.