Revert 606132f..37f36f7

This rolls back to commit 606132f18e7b391cb73ff1da18cf2032671ca3ab.