This reverts commit 923c944abb. This commit broke the image dnd, and the async loading isn't that important here.
923c944abb