Revert 84a35ab..fd95dea

This rolls back to commit 84a35abb81dfb86b9fe8c6c4b8e795e86a392568.