Revert "Merge remote-tracking branch 'origin/development-virenerus'"

Unbuildable!
This reverts commit 4ea53eb9b112491b141abd58e37735f78197f435, reversing
changes made to 8d54df5d4562a253211a027f593ed76f6d180224.