revert event namespace change (still not working properly)