Revert 7718a34..610a680

This rolls back to commit 7718a3468cf26cc589f4318ce4a8c7e880aadb5e.