Revert 69c3c86..6575b50

This rolls back to commit 69c3c867af82e6fcb1e5c6b02369ba9e8989f804.