Revert 8a8cf1f..6d6d1e6

This rolls back to commit 8a8cf1fa5d712a22701da30591b9667a66c0b180.