Revert "Abhinav: Final solution."

This reverts commit 62ef0737b3384e117e45279b3eb5b0d391a58526.