Revert a716a76..f165a58

This rolls back to commit a716a76fef3c5cbc6e609afdc05a96151a21e43a.