Clean solution for abd6e7e.