Reverted some things, will add new branch for 1.8