Revert 5c83de9..9b895c5

This rolls back to commit 5c83de9f8f6d428914ffbe7d2db9162c49076523.