Reverted changes for debuging accidentally commited