Revert fc2ad0c..9074b29

This rolls back to commit fc2ad0cbd5128873d81ea33dbf76786aeb3b58ae.
Clean fixing apporach!