Might as well revert the changes to this file since we decided to stick with solid.