Remove scope hack since 2.3 has been fixed