Revert 1179b69..ed66543

This rolls back to commit 1179b692e33ee25198df771f5dd05725de46944c.