BISERVER-7777 Backing out due to PUC broken