Revert 8e537f4..5a8181d

This rolls back to commit 8e537f4d1889ff510ec34a4de016d2424597d144.