Revert 425e57f..da49c8f

This rolls back to commit 425e57f4e53f467de3bac12d8d6d6c05da2193e8.