Revert 47caa5b..5808d6a

This rolls back to commit 47caa5bd55a9ae1a1fa7ba4674a0ca67c559ed5a.