Cleaner re-push of the changes earlier submitted.