Revert "Implemenation of APPM-55"

This reverts commit 6879460475416c4ee3c8f126369533289f95e242.