Flushing changes from yet another attempt. Still not completely there yet, but closer.
/cc @jerome
This will create a new commit in order to revert the existing changes.
