This reverts commit 3c26bea583. Reason for revert: Fixed in I8ecc1609d929ac5a8d4d73711b15b4a741d910a3
3c26bea583