Revert f063f15..6888a10

This rolls back to commit f063f15b09f44d9ce5d9b45e4ea763fc31b06714.