Rollback

@abinoda git with it! (ignore previous pull request - sorry!)