Revert 219a378..f842e8e

This rolls back to commit 219a37806c74f94dbb8b9d1521e7af3fac653a36.