Revert 9e0faba..e7d5fa3

This rolls back to commit 9e0faba27154001ea188ab14f0059aaaa300458f.