Remove 0.2 compatibility work arounds.