Make note to add back once vulcanize bug is fixed