Revert Patch 91d47a5e8f71e8c8d789dc75c53ac853af7be251
and Patch 2a97abc2c58e67c3e0d8151daf3ce530cec472c2