Revert 66158c4..e508879

This rolls back to commit 66158c4e43537bf10c860cffe85e9e76decfa26f.