Revert 68be123..32b51fd

This rolls back to commit 68be123baf8a897ee5abfff70aa8ed1baf632e73.