Revert 8c82778..1c37424

This rolls back to commit 8c8277895a83446e989cbcdc92cdae74796c20d4.