So, now can you rollback cc5051a9e6c7748027608876fbd08930a0a5ecb8?  IIUC it's redundant now.