Revert f1034c7..697b22e

This rolls back to commit f1034c7ab5b7a209a3aa984d76b75a19246b929b.