Revert "Replace new framework"

This reverts commit 80ede677dbec23fbbb801f389242897113417c16.