Reverting back temp hacks, as they were solved by the latest merge from upstream