Revert add8115..1d358df

This rolls back to commit add8115b8afa8dedd28186aafadd6b93663da68b.
WORKING VERSION!!!!!