Remove conditionals causing a bug in listings.