Reverted last commit 

This was changed in #26