Removed backwards compatibility hack.