Revert "Imported Upstream version 2.7.1191"

This reverts commit a55964b32e6befa02e00257e28892ea6bbae6b0c.