Revert a732cee..0395131

This rolls back to commit a732ceed8365d0cdcd2daee408ffcdd69c6b1a17.