For the record: as discussed in GChat there was some misunderstanding of requirements. This will be rolled back.