Revert 97f6907..54b8a99

This rolls back to commit 97f6907c2507dc9efa5198d0beb94a8516a1f93e.