Revert 9fe63d0..49afa3b

This rolls back to commit 9fe63d042f536e91ea51c17076aa2cba92aae37e.