Revert removal to allow Bookmark tabs as Folders to work
This reverts d0ae59834896fed1114b194680d7d7573f9f7eae which was mistakenly removed.