This reverts commit 25d65b545530f7155734a06ef0e5143b4edb8ff9. There's a more thorough fix in f9317bf0bed0e0f248c18114afa24dcd56d727ae
This reverts commit 25d65b545530f7155734a06ef0e5143b4edb8ff9. There's a more thorough fix in f9317bf0bed0e0f248c18114afa24dcd56d727ae