Revert b207278..341858f

This rolls back to commit b2072786bfeb0a9ea579c3962ee5d4847dbcffa8.