Revert 68be123..e415676

This rolls back to commit 68be123baf8a897ee5abfff70aa8ed1baf632e73.