Revert 6e70558..0367562

This rolls back to commit 6e705585449b61ae28c34f9c6f26b791367d8825.