Reverted changes of commit 2bef91b that adds websockets