Revert 8b8241e..47ee86a

This rolls back to commit 8b8241e89031eba488f96cb3e37728032946e30b.