Revert 72afe09..867e844

This rolls back to commit 72afe092097e2d237ccd7c9599105a0cd99e0a38.