Revert d14220a..5f78b09

This rolls back to commit d14220a69e86d327790234497c3d631cfec18dfd.