Revert 9da9ec7..97ab6f0

This rolls back to commit 9da9ec728da121d60c817b6d1d49d30eaaed268a.
68