Revert e22844b..247d48d

This rolls back to commit e22844b54b756a8b3be943a8f5959f6896bcc632.