Temporarily removed 3.3 compatibility