Revert 2177711..8c4cb03

This rolls back to commit 217771119c7be8372dc17d6de8bfb95f9f8e1fa0.