Partially reverted previous commit

I added mistakenly various local-only changes.
3 files changed