Revert 2f73067..92c09c2

This rolls back to commit 2f730670a8b0cdbc7b2995dfe9093a26d55ae5e4.
Revert 92c09c2..7d43b16

This rolls back to commit 92c09c26e7003510ae5adf330bf9b95429ead5f6.
trying to get rid of errors