Revert 2417f96..8608d68

This rolls back to commit 2417f96c29095440f90ac2e1ae8e34a2022162e1.