Revert 44a8e31..c62f9bd

This rolls back to commit 44a8e316430cb3ea4dc0144499b68fcd0a77c5e1.