Pushed another commit that actually solves this problem.