Back out "upgrade" to latest ol3