Revert 34bfad8..b0246cf

This rolls back to commit 34bfad8851ff138fbe3d9c9750c09be30b9ae4b9.