Revert 26728a5..41020e7

This rolls back to commit 26728a5ba24b29fe09106f18b0735d1a796a8b0a.