Revert 6fbd39d..fbd1a32

This rolls back to commit 6fbd39dda90d423c6d2e64e99438ad3fe21c99bd.