Revert 62941c1..82e03b8

This rolls back to commit 62941c19443b07cd5ece896ec87c33181087e1ef.