Reversed previous commit, caused problems