Revert 6200532..da92cc4

This rolls back to commit 6200532a0de4feb3829fbe4db80503b938131082.