3A101c: Reverting 3A101b

This reverts commit 880be0933aa8a469514695d4a8d8fca68f577f21.