Removed commit ed8c25ef7cc88a19bc9abf9fe4d464e9b4f807f6 as it causes compatibility problems.