Revert "Merge branch 'master' of github.com:openlayers/openlayers into dimNG"

This reverts commit 3eaa414d76151f1b7012fdb371f303e3bfa49a04, reversing
changes made to 16665f39d84c611455e97b61c20732cf0aa38d31.