Revert 7e6346f..b75d0e0

This rolls back to commit 7e6346f98d579ee7c47fd3ed75dbede366e7d3aa.
reverted back to working solution