Revert 1ea1e9c..4bf7250

This rolls back to commit 1ea1e9cf36fd889cacc769dd42c32148cad1bf6a.