Can be merged only after Sid signs off on it and after we have published the post mortem.
cc/ @sytses
This will create a new commit in order to revert the existing changes.
