Temporary rework of arduino-core (1.0.5)