Revert "Update for full bank support"

This reverts commit 5c9a1451bc35eab2200f97e8f9fccee2ee3b1641.