Commented out the UI changes for the mean time.