Revert aab3131..42172c4

This rolls back to commit aab3131d15bbdc0fd604cdf267636bf4bbe18133.