Revert 5f60c42..b26197f

This rolls back to commit 5f60c4228c0ae2c54e41cf9eaea418f018eb5b1c.