Revert 8a0d67f..4079e31

This rolls back to commit 8a0d67f20935d118fbb58cba4cfb415f7414a4fd.