Revert a53ae91..6e17507

This rolls back to commit a53ae9139c33fe3328dc70e35675484882904d36.