Revert "Abhinav: Final Solution"

This reverts commit 0e74e87fa2d61c040faecedf92e72483af567701.