Revert 6d7ea72..47dcc13

This rolls back to commit 6d7ea723bff1906a91bfe397770773c308e00fd1.