Revert "Merge remote-tracking branch 'origin/abstraction_dev'"

This reverts commit c90f4746c51764ce83ce858233e5689756ffc44b, reversing
changes made to 70f4018c3d1f471554dfde1d3c5f646d830c5828.