Reverted unrelated visibility changes, pushed separately