Yet another dirty sync commit