Revert "Bookmark controller beta"

This reverts commit b07ba27be969c3c0be253c8155586a8d244d0ce6.