Revert 86136c7..73894f5

This rolls back to commit 86136c724d15767cfdb7049b2d8f3423da190905.