I've been torturing Shiro with points and questions for God knows how long. We've looked through everything that could cause any issues and I believe that Shiro did a good job on this set. I've also got people to test it and asked around about the diffname and stuff. After some thoughts we've came up with the current diffname.
Summing it all up, I feel obliged to bring back what we've taken.
Bubble #1 
Summing it all up, I feel obliged to bring back what we've taken.