Revert c451688..a72e128

This rolls back to commit c4516884d6dc73812dec49d025816f8baaa48cf4.