Revert 9f78572..75ac48a

This rolls back to commit 9f78572bc219e605ef63ac13ab28ba779efc3aef.
before adding image feature