Revert 85fb5b5..d98c847

This rolls back to commit 85fb5b52dca18b23d2623221b3e98ece97b68ddf.