Revert "Merge branch 'topic/prototype'"

This reverts commit 825f2271865e0156de2b46640d62afd08efab427, reversing
changes made to 37172ac7520359919e643bfdd34cdb570c5c83c9.

I mistakenly merged the wrong branch