Revert "Revert "Revert 94d73a1..b5451ef""

This reverts commit 4e03382125a52c1d9fc3ad084f8bf7d38e67cfe0.
Revert "Revert "Revert "Revert 94d73a1..b5451ef"""

This reverts commit f8a67c976f9b8c134d12498b6a06fa619ea9f2e0.
finalize write-up