Bring back the reverted changes under the new license

This reverts commit 05e3e919023df28e5aca2d9ecb8c2266a8273c67.