Backout multi config fix for keystone until all changes go in at the same time