Retrieve lost commit cc2678c54

cc2678c54e50da2458c7d17441598c58ca5d3536