Revert 86be8a7..d8acfb1

This rolls back to commit 86be8a7b8e12364e8a7154a5b46987ead84ffde6.