Revert ba8ab6f..9bdb545

This rolls back to commit ba8ab6f71cf096c5550794e524f4e82d73a3510a.