Revert "Merge branch 'feature/bird1204' into devlop"

This reverts commit 1f682904147d368c54236042f2d62a32f163700f, reversing
changes made to 857b65a45d449fb14e9d2009874b6a5929610ced.