Revert 2f43cf8..d970b05

This rolls back to commit 2f43cf8edb4c13d09aaa72391b1a251731bac282.