With @ruebot's appoval, removed safety logic added in b38b209.