Revert "Merge with master + currently broken review mapping"

This reverts commit 22f7c2b010dc4c16280fe9634cf020595526f35d, reversing
changes made to 745884dc8375034599a00c9895f5da9bc96c8037.