Revert "Merge in 2.3.x"

This reverts commit 65ad1ceccee0323809a72ea9f8f4b3d949064b09.
Better merge-in of 2.3.x
Because who wants to wait for database operations

?
Fix for dealing with already readable content.
Better use of already readable items.