Revert "AlbumController update"

This reverts commit 39257fb21c99e01d937b0049de63884ef948dce0.
Revert "AlbumController update"

This reverts commit e10133eae00ee5117975c5993f0d1bdb3f991841.