Revert e254647..f6971ce

This rolls back to commit e2546474394bbbcb028e76aad67e460072118b13.