Revert "AD-47 and AD-48"

This reverts commit 119eb41039ac9313ff926b45ef29f53ca814ec35.