Revert to original working version

This reverts commit f1d5faceaada5190c598544940da1d78c4093368.
Revert "second commit"

This reverts commit 51dee70f39355753d05da8e8d75da235d54df403.