Revert 9378065..dc269da

This rolls back to commit 9378065aa8f8bf48bd8a9a23465a8ae8c379fb53.