Revert 84bdbae..3834516

This rolls back to commit 84bdbae17991c8dcb0ca8e0ce47730cc804059db.