Revert 9af809b..006a748

This rolls back to commit 9af809b7592f240774b569446f60d8ab3287ede3.