Revert 63b8b4b..4470ce8

This rolls back to commit 63b8b4b4b22af25d1a6227912917c37d1689066b.