Revert dd05911..604c56e

This rolls back to commit dd059118468cf8fa1e581259cd8f569e9418ec0f.