Revert 2057e5f..d302a25

This rolls back to commit 2057e5f40efdc49bec2c9c219acc1f59aad3477d.
Saving work temporarily

possible solution to some problems