Revert "Merge branch 'blac-17' into dev"

This reverts commit c1e49abb886415d786d4e3124dd4ba950dbb1883, reversing
changes made to 03e5798527cacd13d903e771f455eb5c99a4876d.