Revert "Merge branch 'raven02-master'"

This reverts commit 2f50bec77934e17a820ad3f4437775dc9921ce1b, reversing
changes made to 63682aacae3ffad4693aaaa86244cf4fc06ef9cc.