Revert 6a607f9..818b30f

This rolls back to commit 6a607f97e45885283c3681976b739c2335710849.