Revert b30c1c8..718ae0e

This rolls back to commit b30c1c80cf3db63e9b58d7a58421804882921cee.