Revert 83a640c..d787e01

This rolls back to commit 83a640c0e0755812ef29fda04bdfea3f08022a44.