Revert 8f90fa8..7611fba

This rolls back to commit 8f90fa8b375321990b459448b0be6e46f9f95c70.