Revert "Merge branch 'feature/stabilization'"

This reverts commit 76be936ea22d6c98fedbf31a26a0bf6574cf03b1, reversing
changes made to 402e33def2e5883e8c3161edd3227491c2caa30a.