Revert 697f8e7..dbff5f8

This rolls back to commit 697f8e76596e4f814a6f3f3a9d07731ab5a92902.