Getting rid of unnecessary hybrid object that was used for experimenting
Revert some unintended changes