Revert 9011a07..770d3b3

This rolls back to commit 9011a0709e2f5f0ee7463e1b44fce8295d68da9d.