(chore): Rollback Raw Boost and normal Boost changes (re: #566)

Is this a bug? Make sure to use the Bug template above and be as detailed in your report as possible.