Removed 3.5-specific bits