Revert 4030fd6..8fbab64

This rolls back to commit 4030fd6ea573634c9f94773de6c061aaf5ef7890.