Revert 8bf5d47..8b157c5

This rolls back to commit 8bf5d4772ae79626e751427dc1000575317913c2.
Revert 8b157c5..cff0d48

This rolls back to commit 8b157c5977363e7be08e35a079473a95c99cee69.
Current Verson