Revert "12-2-a"

This reverts commit 3dadc08e4267a72ff960e787596c52025df0f51a.
12-2-b