@kohsuke can this whole PR just be reverted until it is actually done?