Several things broke, so reverting to previous commit