Revert e3df8b8..eeeb750

This rolls back to commit e3df8b88602efe903c4b8bc791abaef43f451dea.
After Rollback

This is an attempt to fix the project by rolling back