Revert 7dca4af..3a614b7

This rolls back to commit 7dca4af1fbaa6a5a79d6df51e18d9bc02ce95186.
Reverting

Reverting previous commit to start from a different perspective.